Changed Layout, made it more readable.