Added Icons and Some AutoLayout tweaks