Pulls alpha mark and usa bug out into includes. Cleans up subpage layout.