Fixing layout a bit to make it better looking