Layout now working
Added some functionality. Not finished.