Layout fix and some functionality add