Removed screen from class parameters, fixed button size