changed design and added more elements