Misc changes and fixes.

Not sure how to fix always on top. :(