Realigned code, small UI improvements