Fixing bugs and styling for someday_maybe