Small Layout Changes + Added Icon (Rough)