Fixes & Changes

Changed theme, fixed length issue