Merge updates & fixes.
Added a fixed height setting for the tabbar, as discussed in #40