Fix up the layout a bit
Setup alpha version of basic app