small code cleanup
fixed picture UI