Sixth Commit

Solved the bug. Will change layout later.