Post-Heading Break and Editing Button Position

[Orion]

The following two issues are of some minor annoyance to me, yet as they are largely aesthetic in nature, I thought it best to pose them as an inquiry rather than a proposal. Given that the issues seem linked, at least in my mind, please bear with me while I attempt to explain.

First, on my personal wiki the break following the insertion of a heading appears abnormally large, as seen in the first textual-example in the graphic below. I would like to inquire of any experienced XWiki-users (and/or the programmers themselves) if this can be modified to appear like the second example. At present, it not only appears odd, but is distracting when attempting to read the content of a large, content-heavy page.



Next, I would like to inquire whether the "Edit" button on a heading can be modified to appear above the heading line, as seen in MediaWiki. The image below should explain things more succinctly than I could.



As I said, they appear linked, given that the position of the edit button below the line leads to a break between said line and the content (though not as large as appears in my wiki), thus moving such above should allow the text to be raised. Can this be done? Perhaps by fiddling about with the style.css file or is there an option in the wiki itself? For that matter, is it style-restricted? I am presently using Colibri, if that matters.
A reply would be most appreciated...