Added modules polished layout