Design update
Swap time button by username button
Update images