Fixed layout and added icon :>