Working, making layout changes now
A bit better layout