Getting ready for custom stabilized view

Some quick fixes.
Also added temporary stub for gallery.