Some content and button fixes