Design tweaks + fix project order