Added some margins.
Removed unnecessary actions