Removed dumb layout and added cool stuff!