Added some interfaces & Spacing on window