Hack and styles fix