Major Layout changes, new buttons