Cleaned up layout and adjusted key++