Castle buttons corrected