Started working on improving layout for smaller devices