Various Android updates for building
Updated layout to work better on multiple devices (e.g. S4 mini)