Merge changes
Define new action-button style
Fix table layout