update layout for better readability
add shortcut functions