Finished basic UI and about to merge withe shappys branch