Add back caption
Move focus stuff to post view render