Fixed some errors and added layout for tablets