Added new btn, some fixes.