Config app for windows and tidy up layout