Added buttons, updated image/name handling