Design revised
Added navigation