updated draw layout, cleaner more functional.