Cleaned layout a bit