added automation stuff
fixed some layout