Layout changes (seems to work :)
TO BE CLEANED UP!