Button fixes+structure added