Cleaned up the code. Testing the new layout and functionality.