Added Box and changed Main