UI auto update button positioning
Code cleanup