changes to design and adding last elements