Layout/ Changes in main.java