Fixing bugs
First user interface layout