Fixed tabbing and added button formating - have not tested it out yet