Comments working, action button fix