Cleaned more code - better readability
Also fixed popup laignments and CSS